bitkeeper revision 1.1159.183.25 (41aa3134G_z_Y-xcfZPe1pfsJn6AMg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 28 Nov 2004 20:12:36 +0000 (20:12 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 28 Nov 2004 20:12:36 +0000 (20:12 +0000)
commit21a524a189a13a15e5159e14e090452af22def82
treee80ed285c655f2422433705cfaa19159025fb29e
parentd7ead0994ead6f849613a75f9a57558bf9b15cc9
parent2dfd28a23fd36fca8feb6c209260b786e78f6727
bitkeeper revision 1.1159.183.25 (41aa3134G_z_Y-xcfZPe1pfsJn6AMg)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c